move XENMEM_get_vnumainfo out of tools-only section of public/memory.h

After all this interface specifically exists for guest kernels to learn
about their (virtual) topology. I'm sure I made a comment to this
effect during review, but apparently I then didn't notice that this
never got carried out.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h
index db961ec90aedc05fc6f4343e166d651750c7b27c..f02195890a4fa7e77571213f4cc4238e037e396e 100644 (file)
--- a/xen/include/public/memory.h
+++ b/xen/include/public/memory.h
@@ -521,6 +521,14 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t);
  * The zero value is appropiate.
  */
 
+#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
+
+/*
+ * XENMEM_get_vnumainfo used by guest to get
+ * vNUMA topology from hypervisor.
+ */
+#define XENMEM_get_vnumainfo                26
+
 /* vNUMA node memory ranges */
 struct vmemrange {
     uint64_t start, end;
@@ -565,14 +573,6 @@ struct vnuma_topology_info {
 typedef struct vnuma_topology_info vnuma_topology_info_t;
 DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t);
 
-/*
- * XENMEM_get_vnumainfo used by guest to get
- * vNUMA topology from hypervisor.
- */
-#define XENMEM_get_vnumainfo               26
-
-#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */
-
 /* Next available subop number is 27 */
 
 #endif /* __XEN_PUBLIC_MEMORY_H__ */